Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 8 Jan 2010 06:58:54 +0000 (07:58 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 8 Jan 2010 06:58:54 +0000 (07:58 +0100)
commit174cbd6c648cce5f95af1059d417193e5b3b49f1
tree1565dec9aab457a518c9208fc850f1732e4d8dfa
parent15461b36ca1ff814c7db404ef940bd85a824b119
parentcdfd32a479877290fc785c7e4dcce3206cbdbcb3
Merge from trunk